css for profile page
k
Merge branch 'master' of heroku.com:elec3609-friendzone

Conflicts:
	src/main/webapp/WEB-INF/jsp/profile.jsp
Merge branch 'master' of heroku.com:elec3609-friendzone
changes to css
edited meeting stuff
meeting stuff