Merge pull request #1 from citylims/working

templates and paths
Merge pull request #2 from citylims/working

Sunday Merge
Merge pull request #3 from citylims/working

Working Monday
Merge pull request #4 from citylims/working

Tuesday night merge
Merge pull request #5 from citylims/working

Working
Merge pull request #6 from citylims/comments

Comments
Merge pull request #7 from citylims/tagging

Tagging
Merge pull request #8 from citylims/style

Style
Merge pull request #9 from citylims/style

padding adjustment for nav links
ready for deployment
ran bundle install
adjusted get '/'
fixing index bug
adjusted caption
adjusted get '/'
resolved conflict in index.erb
resolved conflict in app.rb