tuesday stuff
fixed merge conflixt
Merge pull request #43 from ricarora/thing

tuesday stuff