Messed everything up trying to understand SQL
Ignore this - have to commit to pull Dan's changes
Can't create accounts, but at least trying doesn't give you an error!
fuckin egit
Merge remote-tracking branch 'decker/master'
Pulling account info from the database works!!!
Hiding apikey.txt
Updated Readme with instructions to use the database
Can successfully check if an account exists
Account creation works! You need to regenerate the database so it is in
the correct format.
You can now add media to the account from the web interface
Merge remote-tracking branch 'chris/master'

Conflicts:
	TV Tracker/src/com/goddammitus/tvtracker/client/AccountCreateView.java
	TV Tracker/src/com/goddammitus/tvtracker/server/LoginServiceImpl.java