adding paperclip gem
adding attached video field
added video validations with testing
ignore data folder
adding video model with file attribute and create routes
adding video to view
ds_store
removing ds store from repo
remove ds_store
adding amazon web services sdk
adding dotenv gem
ignore .env file
was calling dotenv gem twice
removing ds_store from repo
removing cap/mysql gems and adding pg gem
removing deploy config scripts that were neccessary for rackspace
removing capi
Merge branch 'master' into add-paperclip-gem

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
setting up videos controller
expanding dummy text for lesson description