Pre Merge Commit #1 - Jan 16 2014
Commit #1 - Jan 18 2014

Merge branch 'master' of https://github.com/LaraiFox/fse.git

Conflicts:
	Flight Squadron Epsilon/src/net/laraifox/fse/main/Fighter.java
	Flight Squadron Epsilon/src/net/laraifox/fse/main/GameDisplay.java