add .env to .gitignore
pushing from macbook air
merging from kyle
Users can now add artists to their own collection from the artist index page
Merge pull request #6 from dancingshell/Brandon

Fixed controller name for MixnMatchCtrl
Merge branch 'master' of https://github.com/dancingshell/MixnMatch

Conflicts:
	.gitignore
Merge branch 'kaitlin2'
Created MixnMatch user signup and login, and profile model and controller