Merge branch 'master' into testing
started comment implementation
Merge branch 'master' into testing

Conflicts:
	views/blog.erb
Implemented glorify markdown for blog
Merge branch 'testing'