Initial commit
init
Merge remote-tracking branch 'GlobalTax/master'

Conflicts:
	css/bootstrap.min.css
	index.html
	js/bootstrap.min.js
init