Merge pull request #1 from Johnmalc/master

df
hgj
Merge pull request #7 from lollolk/master

jhgj