initial checkin
Merge pull request #1 from joelmartinez/master

Initial checkin