added new features
update gitignore
removed file
Merge branch 'master' into 150213c