Merge branch 'master' into ceciliam
Added if statement to not show image source if image not uploaded
Deleted create view and combined created create-edit view
Merge pull request #18 from LAFcaptstone/coreyk

Coreyk
Updates

created user tables migration/seed. Added CSRF and working on admin log
in.
conflicts

corrected merge conflicts
Completed edit, update and destroy functions and added ability to search for specific posts
Added search form
Added edit and delete links and js script to delete post
Added js  and jquery scripts
Combined create and edit views into one
uploaded image
Fixed merge conflict
Merged changes
Uploaded image
Added route for dashboard view
Added showDashboard method
Added classes for styling
Completed log in

Completed auth check, log in/log out.
Added classes for styling