Completely integrated commenting into the page
Settings change and little tidbits
Merge branch 'master' of https://github.com/eliezer15/426Project

Conflicts:
	.gitignore
	Server-Side/comment.php
	Server-Side/orm/Picture.php
	Server-Side/orm/User.php
	Server-Side/picture.php
	Server-Side/user.php
	css/mystylesheet.css
	css/popup_comment.css
	index.php
	js/comment.js
	scripts/user.php