merged develop
fixed tims dumbass mistakes
Merge pull request #16 from 3ashtag/requests

Requests