added our urls
Merge branch 'master' of github.com:gSchool/submissions
Merge branch 'master' of github.com:gSchool/submissions
Merge branch 'master' of github.com:gSchool/submissions
John's project
John's project
Merge branch 'master' of github.com:gSchool/submissions
Updated John Maddux project
Merge pull request #145 from ebdrummond/master

heroku provisioning request
Merge pull request #137 from jemaddux/master

John's project
Update jennifer_eliuk

Using hstore in my db instead of polymorphic relationships
Merge pull request #146 from 7maples/patch-6

Update jennifer_eliuk
Stub portfolio page
Merge branch 'master' of github.com:gSchool/submissions
Reorganizing files
Changes to project
changed heroku needs
Update

Updating app info
Merge pull request #149 from danny-g/patch-5

Update
Merge pull request #148 from chelseakomlo/chelsea_komlo

changed heroku needs