factory'
git pull
Merge branch 'master' of github.com:JeremyWright/rt-r

Conflicts:
	public/javascripts/prototypes/user.js
Merge branch 'master' of github.com:JeremyWright/rt-r
Merge branch 'master' of github.com:JeremyWright/rt-r
Merge branch 'master' of github.com:JeremyWright/rt-r
BUGS
Merge branch 'master' of github.com:JeremyWright/rt-r