added bootstrap
Merge remote-tracking branch 'origin/master'
added more bootstrap
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/templates/index.ftl
added more bootstrap
Merge remote-tracking branch 'origin/master'