Finished 3.6
Merge pull request #34 from NintenJoe/Task-3.6

Finished 3.6