add controllers and views
update merge conflict with user authentication
Merge pull request #23 from toannguyenle/rails

add controllers and views