Merge branch 'master' of https://github.com/NikhilNanjappa/diary

Conflicts:
	app/assets/stylesheets/my_style.css
	app/controllers/application_controller.rb