merge
Merge branch 'pre-alpha' of https://github.com/davidhel/FuelLogger into pre-alpha