changed blog layout
started blogmake changes, and navbar tweaks
Merge branch 'master' of https://github.com/AppleTreker/Minuteman-Robotics

Conflicts:
	db/dev.db
	views/blog.erb
tweaked new blog layout, and model for comments
more work on comments
worked on commenting scheme
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/dev.db
	models.rb
Added comment approval
finished (hopefully) comment viewing
blog comment merge
minor tweaks to comment system
removed title from comment model
blog comments moved to only blog/v/ page
tidied up
more tweaks
Added content to about page
tweaks on comment modal
edited about content
Merge remote-tracking branch 'origin/master'
removed picture from blog