imported
readme removed + gitignore added
tabs to spaces
Merge branch 'master' into cosmetology