Second commit
Stupid merge for setup
Merge branch 'master' of https://github.com/Arlandw/checkme.in

Conflicts:
	Bootstraptest.html
	agency.css
	css/agency.css
	js/agency.js
	js/contact_me.js
	js/jquery-1.11.0.js
	less/agency.less
	less/mixins.less
	less/variables.less
	mail/contact_me.php