mobile friendly
fix merge?
Merge branch 'master' of github.com:angelali/harvard14

Conflicts:
	js/main.js