some Shit
Animations

Bugs still in
Stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Aegis - The Game/Aegis.caproj