Initial Commit
Merge branch 'master' of https://github.com/cmusv-sc/Practicum2014-Ericsson-Authentication
deleting stuff
Initial commit again!
Create README.md
delete
Deleting...
Deleting

Starting a new Master. Changed the libraries we want to use.
Deleting hidden files
Merging Master

Merging Master with develop.
Added Active User

Added postLocation and ActiveUser table
Pushing the TV app
refresh WatchTV .git
recall WatchTV .git
merge conflict from NewTVAppBranch
merge conflict from NewTVAppBranch