v1.0
Merge branch 'master' of https://www.github.com/jacoman/random-code

merging because i want to