changed new user welcome slightly
styling stuff fixed
Merge branch 'master' of https://github.com/jsntsay/clash
Update bug fixed
sample data changed
Merge branch 'master' into heroku