Added gitkeep files to be able to commit empty directories
Merge remote-tracking branch 'origin/master'