Made index page.
Added bootstrap, created a base header
Renamed application.css to .scss
Made additions to Index page and Nav bar.
Added Admin, created ability to create Username for Admins and Users.
Continued work on the page responsiveness.
DS Store should be ignore...
Just DS Store files.
Merge conflicts solved.
Merged Erik's pull request, simplified merge conflicts and moved code to CSS instead of HTML document.
Added new pages, ignored DS Store again...
updated schema.rb