Merge with rescued jon branch
Adding login and signup pages
Added explanation jumbotron to landing page
Added second slide to jumbotron
Removed old jquery version that was being overriden
Added account.html stub
Merging with eyuel's branch
Fixed merge conflicts
Tested an approach to fixing link ids
Merge pull request #14 from DryTuna/jon

Jon