jQuery-UI
03b2ceb..1d0abd9
- modified:   Gemfile
- modified:   app/assets/javascripts/application.js

- Added jQuery-ui-rails gem and required it in .js file.
  jQuery UI may take a while to execute so for production app its recommended to only include modules app will use.
  ex. //= require jquery-ui/datepicker
bootstrap
1d0abd9..d29de7e
-	modified:   Gemfile
-	modified:   app/assets/javascripts/application.js

- Added bootstrap-sass gem and required bootstrap-sprockets in JS file.
Added .scss extention to application.css file to use sass
Font-Awesome
- d29de7e..07c872b
- modified:   Gemfile
- modified:   app/assets/stylesheets/application.css.scss

- Added font-awesome-rails gem and imported dependancies to application.css.scss
Css.scss bootstrap imports

- ff51608..9b242d7
-	modified:   Gemfile.lock
-	modified:   app/assets/stylesheets/application.css.scss
- ran bundle install to add gems ive added to project
Bootstrap basic UI

- 0000000..cb8afe7
-	new file:   app/assets/stylesheets/Custom.css.scss
-	modified:   app/assets/stylesheets/application.css.scss
-	new file:   app/views/layouts/_nav.html.erb
-	modified:   app/views/layouts/application.html.erb
-	modified:   app/views/site/index.html.erb

- Added bootstrap SB admin frame
- Under application.html.erb added div wrappers, renders and yield in correct place
- Added the nav as a partial
- Troubleshooted CSS posistioning
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Capstone
Merge pull request #6 from cmckee-dev/develop

No worries. We can merge this to get moving forward. We can refactor as we go.

Merged.