lal
merge
Merge pull request #2 from Chenyijun/master

Added authentication
edited inputs form
Merge pull request #3 from maggieli321/master

simple forms
merging branch to master
sangha is the git master
merged with sangha
route merge error
fixed application.erb merge error
Added bcrypt-ruby gem
21guns
merging with sangha
merging application.erb
fixing login
catbug
foundation from sangha
authentication works
Worked on Authorize and some Input controller
fixed input controller