First Commit
Still under construction
Merge remote-tracking branch 'github/master'

Conflicts:
	.gitignore
add readme.md
add readme.md
exclude .idea
Merge remote-tracking branch 'github/master'
Merge remote-tracking branch 'github/master'
Merge branch 'master' of github.com:yelite/Canvas
Modified views
new .gitignore
remove .pyc