merge conflict
Merge branch 'development' into staging
Merge branch 'staging' of https://github.com/COPPER-BOBCAT/COPPER-BOBCAT into staging
merging
Merge branch 'staging'
Merge pull request #8 from RTakes/master

Master Merge from Development
Merge pull request #17 from COPPER-BOBCAT/staging

Added skeleton to index.html.
Setup server with static files.  Added styles.css and scripts.js
Merge pull request #19 from RTakes/master

Added static server, style and js files.