Merge pull request #1 from shawnbro/master

capybara factory girl setup
Initial HTML/CSS
remove database yml
Merge branch 'master' of https://github.com/peterylai/yearbook.er
db
student sign up feature finished
config update
feature complete
Merge fix
cohorts
merge add campus
cohorts
cohorts
student can update their profile with profile attributes
Cohorts cover photo
user sign up
merge fix
a user can login
add user photo
upload cohort photo