...
Merge branch 'master' of git://github.com/leviramsey/tumbleweed

Conflicts:
	views/create.ejs
Merge branch 'master' of git://github.com/mikesteele/tumbleweed