Merge pull request #14 from hollocherDale/master

Merge with master
Merge pull request #15 from hollocherDale/master

Master
deleted unnecessary files
made some changes