(test) basic testing works now
Merge pull request #63 from darkstar21/develop

basic testing works now