Copied files over from demo-app
added serveries page
Removed TodoApp CSS and navigation bar
Merge branch 'dev' of https://github.com/rice-apps/servery-app into dev
Added base.css with styling for nav
updated readme file to demo-app
Changed README.md
readded serveries.html
fixed servery buttons
messed with css
perfected prototype servery page
Created SERVERY APP banner
Created SERVERY APP banner
Fixed conflict
added files
Changed to div boxes for serveries
just fixing changes
created login page
fixed conflicts
Merge branch 'dev' of https://github.com/rice-apps/servery-app into dev