updated Dec 11 8pm
Merge pull request #62 from mgaldzic/updatedDec11_8pm

updated Dec 11 8pm