Merge pull request #5 from dancingshell/Brandon

Setup environment for bootstrap, angular, and active model serializers
Fixed controller name for MixnMatchCtrl