Added .classpath to .gitignore
added .classpath to .gitignore
Merge remote-tracking branch 'dan/master'
Merge remote-tracking branch 'forry/master'
Merge remote-tracking branch 'chris/master'
Merge remote-tracking branch 'DMuckerman/master'
Merge remote-tracking branch 'numberQ/master'
Merge remote-tracking branch 'numberQ/master'
merged successfully?
update .gitignore, remove some auto-generated files
merge with Dan
allow switching of views
Merge remote-tracking branch 'numberQ/master'

Conflicts:
	TV Tracker/src/com/goddammitus/tvtracker/client/TV_Tracker.java
Commit so I can merge
Merge remote-tracking branch 'forry/master'

Conflicts:
	TV Tracker/.classpath
	TV Tracker/.gitignore
	TV Tracker/src/com/goddammitus/tvtracker/client/TV_Tracker.java