test 2
testtt
test
Merge pull request #2 from clottman/goodness

Goodness
merged
added git ignore
removed test comment
added tests
added bin to git ignore
Merge pull request #3 from clottman/kabUnitTest

added tests
Merge branch 'master' into Cassey
halfway through changing basics
Merge branch 'master' into goodness
Stopped lying about two phases