Routes Added
routes and front end
Merge branch 'templates'

Conflicts:
	index.php