added some paths for the entry controller and some blank pages
merge dev
fixed bad testing practice
Merge pull request #5 from erumble/feature/entry-controller

Feature/entry controller
font awesome awesomeness
Merge pull request #7 from jbrewton/feature/font_awesome

font awesome awesomeness
merge in dev

Conflicts:
	Gemfile.lock