Changed edit form, removed application.css.scss
Removed application.css
Started styling the resources index page
Started modifying nav bar
Merge branch 'Bootstrap'
Fixed merge conflicts - Aug 24