buffered image
Merge branch 'master' of github.com:Terrapin-Jumpers/mhacks
Merge branch 'master' of github.com:Terrapin-Jumpers/mhacks into dev
Merge branch 'dev'
Merge branch 'master' of github.com:Terrapin-Jumpers/mhacks

Conflicts:
	src/Actor.java
nothing
nothing
Merge branch 'master' of github.com:Terrapin-Jumpers/mhacks
Merge branch 'master' of github.com:Terrapin-Jumpers/mhacks into dev
removed dup methods
Merge branch 'dev'