change font size of flash notice and remove comment from session controller
extract method to module, fix omniauth signup bug in user model, clean up comments
resolve merge conflict