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

Conflicts:
	db/dev.db
	views/blog.erb