added the hidden .env and DS_Store
Merge pull request #3 from EliDawson/master

modified .gitignore with spencer hipchat
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	Gemfile.lock
fixed conflict
solved conflick in gemlock
added secret key base
added models and deleted useless test files
Merge pull request #4 from SylvieC/add_models

Add model