updated construtor methods
Merge branch 'master' of https://github.com/Whirligig231/boilermake2014

Conflicts:
	.gitignore
	src/GameComponent.java
WTF is happening???
kf
sim