Level1
Merge pull request #8 from aproctor/master

Sync
moved
merge fix
Merge pull request #18 from tylerhebenton/tyler_merge

Tyler merge