added dump.rdb
delete dump.rdb from gitignore
fixed merge conflicts
devise STyled
merged
finished basic styling for browse and course show and added validation for course show
commit for merge
merging yutaka's master into steph's master