Trying to get third page to be responsive for instructor consultation
Fixed merge conflict that didn't exist
Fixing bug with added file in javascript
Merge pull request #99 from JessicaTatham/master

Deleted funky file that messed with everything