Cleared project and switched to Boostrap 3 and Flat UI 2.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/addictive.css
	index.html