rerouted if lastfm and rdio email dont exist in their respective systems
Merge pull request #4 from dancingshell/Kyle

rerouted if lastfm and rdio email dont exist in their respective systems
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
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'
added logo and fields for user to add their own item