no change in style.css
Merge branch 'master' of https://github.com/harry08/flashcards.git

Conflicts:
	easyNotes/src/main/webapp/resources/css/style.css