Switched to rails 4, added ember, added spec suite for Rspec and Teaspoon, added Devise and Ember logic for login/reg, added serializers, did minimal CDAI specific logic/views to get running, tests passing
added travis.yml, modified database.yml to user postgres user for Travis to work
typos
Got rid of bootstrap inclusions for now. Files still present.
Added controllers for entries on ember side, added form back in, filled out entries serializer and ember model
added rickshaw chart
moved score out to module, started on rails side validations for entry
Validations and weight added to user model (pair-programming)
Merge branch 'master' of github.com:lmerriam/CDAI

Conflicts:
	app/views/landing/index.html.slim