added parties controller
fixed inflection file confilct
fixed conflict with latest pull
Created test for comments feature
Generated comments controller
in layout view user now sees options to sign up or sign-in, of if logged in, to sign out
adding flash notices for devise logins/alerts
Added comment controller action and view/partials
adding devise views
preventing users from creating, editing, deleting, unless logged in
Added image models, views, and form partials
adding header, dummy links for 'search', 'about', 'contact'; sign_up, sign_in, and create work
Added root for comments and fixed form bug
added rspec to gem file and created cucmumber test feature
installed rspec in the project
fixed parties controller conflict
Merge branch 'dev' into cukes

Updating my local branch with the devise user authentication piece that Keith added
Resolved conflict
rendering table in index, rending info in show pages, set up basic two column css format for index and show pages, right colum is blank, thats for map.
added main image to parties table