test commit
Added gliffy
Merge branch 'master' of https://github.com/CS1530-G7/SocialNetwork

Conflicts:
	ProjectIdeas.txt
added Gliffy