moving over to bootstrap/flat ui
Merge branch 'master' of https://github.com/suyeonson/2014-technovation-challenge

Conflicts:
	css/styles.css