update code and deleting unnecesary files and code
Merge branch 'master' into cleaningCode
Merge pull request #10 from mule-deer-2013/cleaningCode

Delete unnecessary files and updating code to implement group's decision for implementation