0.1.2
Fixed merge conflicts.
Fixed history in the logger.
Merge branch 'dev'
Added EOL to end of files.