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
Merge pull request #22 from melodyserra/master

can now search places
adding seed data ... not finished yet
Merge branch 'master' of https://github.com/prschulz/project_awesome
Search functionality merge
Pull in changes from group members

Merge branch 'master' of https://github.com/prschulz/project_awesome
finished seed file
Merge pull request #23 from melodyserra/master

added bootstrap to application.html.erb
added multiple groups to seed file
Merge branch 'master' of https://github.com/prschulz/project_awesome
Bootstrap added to application.html.erb
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
minor changes made with indentation