color changes to landing page
Resolving merge issues
tweaking with background colors
fixing merge issues
sessions and authentication
fixed conflicts
fixed additional conflicts
Merge pull request #7 from paulhyunkim/aaronbranch

Fixed conflicts between controller/model files