Merge pull request #36 from juljun14/master

user helpers and controller