Merge pull request #4 from korczis/apollo

Ignoring .lock files
Cosmetics for testing purposes
Merge branch 'master' of https://github.com/korczis/apollo into apollo