Added gravity and jumping
Merge branch 'weapons'
Renamed major files
Merge branch 'weapons'
Fixed bug
Started weapons code
Merge branch 'weapons'

Conflicts:
	Blankput.mot
	generator
	generator.c
Started weapons code