Merge pull request #11 from otherwhitefrank/fdye

Fdye
Fixed application.html.erb
Fixed JQuery/BootStrap craziness