final push from Bushwick hackathon
Merge pull request #5 from bigtone1284/alex_step7

final push from Bushwick hackathon