deleted application.css
merging upstream/master
set up backbone architecture and templates
set up backbone architecture and templates
working data model and templates
minor changes to index.html.erb
Added course, cohort and role models, and also API authentication with devise
added bitter assets and seeds for new models
merged conflicts
refactored gemfile, readme is in development phase
merge gemfile and readme
Merge pull request #4 from ChetCorey/readme

Readme
Fixed seed file
old seed data
Merge remote-tracking branch 'upstream/master' into readme

Conflicts:
	db/seeds.rb
Added associations between models
initial commit
first iteration of styling
merging style
grid styling and debugging data feed