magda's changes, fuck github.. sometimesB
Merge pull request #27 from notandrewkaye/develop

magda's changes, fuck github.. sometimesB