added stuff
Merge branch 'master' of https://github.com/snowikines/WundaWeb

Conflicts:
	src/edu/wcu/WundaWeb/MainMenu.java
aha