Merge pull request #4 from jhgamboa/master

Added carousel to main page
Fixed merge and completed remember me