choice tag
Merge branch 'master' of github.com:philippotto/gdg-hackathon
styling
Merge branch 'master' of github.com:philippotto/gdg-hackathon

Conflicts:
	main.js