Initial commit
Merge branch 'xfynx' of github.com:code56/sandbox into xfynx
issues #1, #2, #3, #5, #6