fixed merge conflicts
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4
helping the peeps
Merge pull request #12 from crotten/master

Updating it to the most recent version