initial checkin
Merge pull request #1 from jfray/initial_checkin

initial checkin