merged with master again
Made changes from old pull request.
Deleted unnecesary files
deleted more unnecessary files
Merge pull request #18 from jennwu/master

Fixed changes from code review