change java to php
php to PHP
Merge branch 'master' into chore/seed_database
started seeding the database
Subtle textures everywhere
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta into StyleUpdate
added more enumerable questions to seed file
Merge pull request #131 from JohnathanWeisner/StyleUpdate

Style update
fix merge conflict regarding log file
Media query update for small screens. The Submit answer button has been adjusted in questions_show.css
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta into StyleUpdate
Merge pull request #132 from plondon/chore/seed_database

Chore/seed database
reseed the db with proper question/answer
Merged
Merge pull request #133 from JohnathanWeisner/StyleUpdate

Style update
log merge conflict fixed
Merge pull request #135 from plondon/master

reseed the db with proper question/answer
merge issue