Merge pull request #3 from adam6806/master

Update my own personal branch
Merge pull request #4 from adam6806/master

Update my own personal branch
Test commit
Revert "Test commit"

This reverts commit 637107f2b41aa023ae2bc701632c5b3204344b11.
Merge pull request #5 from adam6806/Adam

Pointless merge to test out voting.