create post scaffold
clean up scaffold, and add template
integrated blogroll
Merge branch 'develop' into blog
install kaminari gem
setup pager
add blogroll ordering
create published_at filtering
clean up and basic refactoring of links and blog aside
install acts_as_taggable_on gem
configure act_as_taggable_on
add categories to posts
create category tagging system, with routing
Merge branch 'categories' into blog
Merge branch 'develop' into blog

Conflicts:
	Gemfile
	Gemfile.lock
fix post.categories issue with rails 4.0.1
setup edit view
setup new view
Merge branch 'blog' into develop