add .env to .gitignore
pushing from macbook air
merging from kyle
Setup environment for bootstrap, angular, and active model serializers
Merge pull request #5 from dancingshell/Brandon

Setup environment for bootstrap, angular, and active model serializers
Fixed controller name for MixnMatchCtrl
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
Merge pull request #7 from dancingshell/Brandon

Created MixnMatch user signup and login, and profile model and controlle...
Created Profile model and setup profile controller and form for current_user
Merge pull request #8 from dancingshell/Brandon

Created Profile model and setup profile controller and form for current_...
added logo and fields for user to add their own item
Merge branch 'master' of https://github.com/dancingshell/MixnMatch

Conflicts:
	config/routes.rb
Created accounts page to link Spotify, Rdio, and Last.fm user_accounts
Merge pull request #9 from dancingshell/Brandon

Created accounts page to link Spotify, Rdio, and Last.fm user_accounts
updated images and minor changes
Merge branch 'master' of https://github.com/dancingshell/MixnMatch into kaitlin2