adding all changes before deplying
Merge pull request #12 from mlee284045/miguel2

adding all changes before deplying