Hill now snaps to grid
Merge remote-tracking branch 'origin/master'
Started working on different weapons
Merge remote-tracking branch 'origin/master'