added and moved and such
Merge pull request #2 from evanbarba/testconflict

added and moved and such