Merged ztmp into master
Added pin editing & deleting
Merge branch 'master' of https://github.com/benk691/UCRinterest

Conflicts:
	ucri/__init__.py
	ucri/static/styles.css
Small stuff:
editpin() checks if current_user is pinner
upload() checks if Title field was filled in, has better returns
Removed like,follow,edit,repin buttons when no user logged in
Added comments
Added repin ability
Added liking/unliking
Added favorites
Fixed overlapping pins bug (I hope\!)
Zach's pin stuff