Merge pull request #3 from stuycs-ml7-projects/jasmine

Jasmine
moving stuff around in master so testinghtml.py works cough jasmine cough