Upgrade Bootstrap to 3.1.0
Merge branch 'master' of https://github.com/yoarts/flat

Conflicts:
	readme.txt