new stuff
Merge pull request #1 from wayuk/master

jkasgd
kjsadf
Merge pull request #2 from elizar/master

asdf