day 2
Merge branch 'master' of github.com:tmatthewsdev/blog_dev

Conflicts:
	fuel/app/classes/controller/blog.php