Resolved merge error in schema
Added Favicon, meta viewport, met charset tags to app.html.erb

***************************
-excite, you be, condo tiny picture, you must like

plus viewport tag to **TIME PERMITTING** make mobile facing

yes...
You like, no?
Bootstrapped rspec
Merge pull request #20 from esparkman/rspec

finally!
finished up faq html, started on general info
finished editing the section of the gen info, working on home landing page
finished the landing page and all the static pages, STYLES still need to be created
Merge pull request #19 from djmrr/mike/favicon_addition

Added Favicon, meta viewport, met charset tags to app.html.erb
Merge pull request #21 from djmrr/mike/html_view_static_pages_editing

merged
added time block at bottom of all static pages making them partially dynamic
Added Posts and Comments
time zone formatted and ish
Merge pull request #22 from djmrr/mike/html_view_static_pages_editing

Mike/html view static pages editing

nice. merged
Merge branch 'mybranch'
Merge pull request #23 from rsoto1/master

Merged.