Merge branch 'develop'
Add gitignore
Trivial
Remove .pyc files
Update HTML semantics
Merge branch 'master' into develop