Added functionality
Merge branch 'master' of https://github.com/mgolub2/dubhacks