test commit comment
test comment
Test committing
bla
c
bla
aye
Merge branch 'master' of https://github.com/jschaul/talkshow.git

Conflicts:
	talkshow.py
a
Added some TODOs
Added a HTML UI for prototyping
First theme deploy
added class to parse CSS file and access attributes from it.
Merge branch 'master' of https://github.com/jschaul/talkshow.git
Added box height resizing proportionally by the number of rows in the
array.
Merge branch 'master' of https://github.com/jschaul/talkshow.git
Reduced number of style properties
Some correction
Box sizes and colours updated. (not upon hover yet). Changed CSS parse
to change - into _ (dash into underscore) for attributes.
Merge branch 'master' of https://github.com/jschaul/talkshow.git