update to bootstrap 3 and refactor
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.md
update to bootstrap 3 and refactor