.gitignore
line endings
Initial style files
Merge remote-tracking branch 'origin/master'