Some basic hooking up
Merge branch 'master' of github.com:i-e-b/SnivellingGit