Update

Add additional files (bootstrap, jquery, css)
Theme
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html