Update Guardfile
Merge branch 'users'
Clean up code style