Merging commit
Merge branch 'master' of github.com:elioht/CalHacks
Fixed color scheme on login
Merge branch 'master' of github.com:elioht/CalHacks