Made App work!!!!!
Merge branch 'master' of https://github.com/luntdotp/FCOHACK2014

Conflicts:
	index.html
Brooken :(