test comment
pulled new comment from cate
Merge branch 'master' into user_model