SOlution file....
Merge branch 'master' of https://github.com/atarng/JAMMM

Conflicts:
	JAMMM/JAMMM.suo

CHANGED ACTORS UP IN THIS BITCH A SHITLOAD. LOTS OF GAME LOGIC IS BEING ADDED IN.
Merge branch 'master' of https://github.com/atarng/JAMMM
Merged.