fix newlines
fix merge conflicts
ignore built-tmp folder, made by processing for sublime text
added gitignore
fixed conflicts with pull req