added stuff
Merge branch 'master' of https://github.com/ldeavila/sd-code-a-thon