made git notice that ocd readme conflict has been fixed
updated gemfile to include: sass, capybara, pg, rspec, annotate
added user MVC, resources, tests. Began StaticPages MVC.
rough completion of StaticPages MVC with Zinstry assets
git rm'd old deletions
added js, css, img to asset pipeline
git rm'd previously deleted assets
added user controller actions & views, session controller actions & views, modified styles