Improved gitignore
Merge branch 'master' of https://github.com/johnASebastian/bearded-cyril
Merge
Allow server to serve static files
Merge branch 'master' of https://github.com/johnASebastian/bearded-cyril