Merge pull request #1 from CS3283-CodeCraft/master

workspace.xml relevant only if you're on WebStorm
Merge pull request #21 from undisputed-seraphim/master

Merge pull request #1 from CS3283-CodeCraft/master