add gemfile cache to gitignore
remove gemfile cache
merging
Removing some duplicate files, .swp, .BASE .LOCAL .REMOTE
Organizing relationships for controllers, layouts, and templates.
Adding modal
Merge branch 'signs' of https://github.com/patel66/HMMC into bootstrap

Conflicts:
	web/app/controllers/users_controller.rb
	web/app/views/layouts/home.html.erb
Fixed a lasting merge conflict, wanted Sign In to point to /login
Touched up the modal, A user can now click sign in, and log into their account, and be brought to their account with the sign in modal
Removed the redundant Sign In
On 'sign in' modal.
You can submit the form by pressing enter, or clicking the submit button.
Changed Sign In/ Sign Out to load based off of if there is an active session key in the browser.

There is a little bit of testing still left in the home.html.erb
application.erb renamed to application.html.erb
should be like this
added home page layout
Updated to have bootstrap version 3

also, changed to using sass version of bootstrap
Holy crap i messed up, start here
added home page video
changed the form to be black, background colors on schol show page
working on pop for activity
the javascript for bootstrap wasn't loading.  Fixed that issue.  Now the bootstrap javascript works, so modal's and drop down menu's will work again,
However, in this process I removed the modals and navigation bars, so I will have to reimplement them.