working on css
Merge branch 'master' of https://github.com/bbellanc/HeritageTrail

Conflicts:
	grails-app/controllers/heritagetrail/UserController.groovy