moved files up one dir
removed old folder
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from tylerism/master

move files