Merge branch 'terencehill/start_ammo' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 23:49:30 +0000 (23:49 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 23:49:30 +0000 (23:49 +0000)
commit5e5fb92433849ce367241c71e11b28420452e3cf
treea7983c4d4d9fafc32d49f37f3841d969dc11f44c
parent9b61a27fb2f6f8839c81461fb151139a0762af05
parent531c25df6a8e61e3839087568a44dc80d3e47f90
Merge branch 'terencehill/start_ammo' into 'master'

Terencehill/start ammo

Fixes for a few issues

See merge request !53