refresh
Merge branch 'toBootstrap' of https://github.com/studiotwelve/Hurley-s-New into toBootstrap

Conflicts:
	.htaccess
	index.php