updated gitignore
Merge branch 'master' of github.com:AKAMEDIASYSTEM/hotpants