little things
merged spaces
updates to mycomp
wtf
trying to fix legarlins comp
stupid stuff?
Merge branch 'master' of https://github.com/legarlin/KeepUp

Conflicts:
	platforms/.DS_Store
	platforms/android/.DS_Store
	platforms/android/assets/www/competition.html
	platforms/android/assets/www/css/fonts/Aleo-Bold.otf
	platforms/android/assets/www/css/fonts/Aleo-Regular.otf
	platforms/android/assets/www/css/fonts/LongCoolMother.ttf
	platforms/android/assets/www/css/fonts/MerriweatherSans-Light.otf
	platforms/android/assets/www/css/fonts/MerriweatherSans-Regular.otf
	platforms/android/assets/www/css/fonts/Vegur-Light.otf
	platforms/android/assets/www/css/fonts/Vegur-Medium.otf
	platforms/android/assets/www/css/fonts/Vegur-Regular.otf
	platforms/android/assets/www/css/jquery.filthypillow.css
	platforms/android/assets/www/css/style.css
	platforms/android/assets/www/css/token-input-facebook.css
	platforms/android/assets/www/css/token-input-mac.css
	platforms/android/assets/www/css/token-input.css
	platforms/android/assets/www/home.html
	platforms/android/assets/www/js/jquery.filthypillow.js
	platforms/android/assets/www/js/jquery.tokeninput.js
	platforms/android/assets/www/js/moment.js
	platforms/android/assets/www/logIn.html
	platforms/android/assets/www/myCompetitions.html
	platforms/android/assets/www/newCompetition.html
	platforms/android/assets/www/signUp.html