fixed .gitignore issue
Merge branch 'master' of https://github.com/espern/tiny_website