nick's spike
working MVP
Merge pull request #3 from tiger-swallowtails-2013/establishing_mvp

Establishing mvp