katie and Emily's code, avanti's code to be added
Merge pull request #2 from zewaru/avanti

katie and Emily's code, avanti's code to be added