Changed the .gitignore file
Pull from github
Added comments and refactored the rendering methods
Merge with source from github