moved edit project link up to project card
Merge branch 'master' of github.com:calblueprint/projectPortal into issue_permissions
fixed css vs css.sass issues
Merge pull request #9 from helenaut/issue_permissions

Issue permissions
added contact and question section to project page
trying to concise css shit
added questions model
can now upload image for project card
using carrier wave default image method
Merge pull request #10 from bspolley/master

Contact and Questions sections added to project page
modified gitignore to ignore uploads
removed dumb css stuff
added to git ignore
changed route for search projects from browse to projects#index
removed unneccesary css file
added questions to seeds and removed subject field of questions
resolved merge conflict
ability to add photos
Merge remote-tracking branch 'upstream/master'
allow only file uploads with standard image formats