Add tests of models
Remove unneeded columns and add description
Merge branch 'Add-tests'

Conflicts:
	Gemfile.lock
Add .env and fix controllers
Merge remote-tracking branch 'origin/master' into create_endpoints

Conflicts:
	Gemfile.lock
	app/models/block.rb
Merge pull request #4 from seanperkins/create_endpoints

Create endpoints
added ux drag and drop
built some services
integrating scope functions
draggin and shit
merged