Merge pull request #1 from ppatel890/master

git ignored
code cleaned up and commented
Merge pull request #2 from ppatel890/newfeatures

code cleaned up and commented
removed pyc files
Merge pull request #3 from ppatel890/newfeatures

removed pyc files
git ignored everything
Merge pull request #4 from ppatel890/newfeatures

git ignored everything
repush heroku
Merge pull request #5 from ppatel890/newfeatures

repush heroku
Merge pull request #6 from ppatel890/develop

heroku push