updated gitignore
merge
alex did something
Merge branch 'master' of https://github.com/MurlocBrand/lhs-test
Merge branch 'master' of https://github.com/MurlocBrand/lhs-test
Merge branch 'master' of https://github.com/MurlocBrand/lhs-test
Merge branch 'master' of https://github.com/MurlocBrand/lhs-test