added dump.rdb
delete dump.rdb from gitignore
fixed merge conflicts
devise STyled
merged
courses page stylin
fixed user enrollment issue
finished basic styling for browse and course show and added validation for course show
commit for merge
.env
merging yutaka's master into steph's master
more style
;
solved merge conflicts
deleted public/assets folder
fixed merges
Merge pull request #53 from stecd/design

Design
merging upstream