no message
Merge branch 'master' of https://github.com/Wyattjoh/TaggingApp

Conflicts:
	src/ca/ualberta/cs/taggingapp/views/TagAndPhoto.java