removed .idea/ fodler
Merge branch 'master' of https://github.com/anplay/CalendarProject

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'