Update builtins.py, base.css and show.html files
merge
Update show files
Update builtins.py file and requirements
remove conflict
Update html files
removing useless comments
removing junk
simplifying css
update css
Merge pull request #13 from fernandovalente/master

Update front files