edited Peters readme
Merge branch 'master' of https://github.com/prschulz/project_awesome
Merge branch 'master' of https://github.com/prschulz/project_awesome
added a paragraph to home and edited the h1 text
accepted the home page title
just testing some ajax
Merge branch 'master' of https://github.com/prschulz/project_awesome

Conflicts:
	README.md
Pull in changes from group members

Merge branch 'master' of https://github.com/prschulz/project_awesome
put GA icon on map
Merge branch 'master' of https://github.com/prschulz/project_awesome
synching up with upstream
Merge pull request #24 from whoistim/master

GA icon into the map