Added some of the stuff.
Merge branch 'master' of https://github.com/JoshBour/asfaleia.git

Conflicts:
	src/asfaleia/Main.java