Merge branch 'master' of https://github.com/ajcummins/LinkUp.git
Merge branch 'master' of https://github.com/ajcummins/LinkUp.git
added comment to mysqldatabase, started basic profile page vieww
Merge branch 'master' of https://github.com/ajcummins/LinkUp.git
stuff
Merge branch 'master' of https://github.com/ajcummins/LinkUp.git

Conflicts:
	Persistence/Persistence/src/edu/ycp/cs481/linkup/persistence/MysqlDatabase.java
test