Edited about page
Merge branch 'master' of https://github.com/cjames1224/AwesomeBox

Conflicts:
	src/main/java/com/netbuilder/awesomebox/services/Queue.java