Ignore OS X file
ERB-lize
Ignore Fire.app log
Fix erb sytax error
Fix spacing for log li
Merge pull request #6 from Dannvix/erblize

refactored views (thanks to @zhusee2)
1. convert haml template to ERB
2. fix spacing issue for log lines
removed Redis database dump file (dump.rdb)
screen.sass, change Desktops min-width
Merge remote-tracking branch 'upstream/master'

Conflicts:
	sass/screen.sass
	views/channel.haml