deleted tmp file
Merge branch 'beta' of https://github.com/CloudClown/Flint into beta
Fixed bug with angular on chat.jade
'
Merge branch 'jackie' into beta
commented out post for testing