Changed site layout, fixed view count bug, and cleaned up what is commited
Merge remote-tracking branch 'origin/master'