cleanup
added *.lock to .gitignore
Merge branch 'master' of github.com:l0ner/l0ner.github.com