planning 1
Merge branch 'master' of https://github.com/natejlong/poloma

Just getting it set up