"Change DateField options to correct format; add photoalbum to "
Added sublime project files to gitignore. Pulled from models branch
Added code from Cris' repo
Added tests for magrUser model.
Completed tests for ImagrUser model.
Fixed conflicts
Merge branch 'user_model'
Fixed merge conflicts