added unit controller, views, tests, modified header to include links to unit pages, added controller tests for recipe (forgot earlier) and unit
fix merge conflicts
updated gitignore to ignore sqlite3-journal
git rm --cached db/development.sqlite3-journal