Removed user_auth.p so .gitignore picks it up.
Merge branch 'master' of https://github.com/HadMatter3/cinemagic

Conflicts:
	pickled/user_auth.p