Changed tabs to spaces
Fixed testing bugs...
Removed branched files unready for commit
Fixed file format to comply with pep8
Merge branch 'master' of github.com:kchenweijie/TaskFlow