Front_End
Merge branch 'master' of https://github.com/techhatch/dawt

Conflicts:
	css/style.css
	index.php