Commit before merge.
Commit before merge.
Merge pull request #51 from cassiemoy/farheen

Farheen
Merge pull request #52 from cassiemoy/farheen

Minor modification for heroku deployment
Commit before merge.
Fix merge conflicts.
Fix open bug.
Minor changes to javascript
Merge pull request #53 from cassiemoy/cassie

Cassie
Merge branch with master