retro default, better size for xs
Merge branch 'master' of github.com:dmamills/hackathon-starter

Conflicts:
	models/User.js