removed .idea junk

Conflicts:
	.gitignore
	.idea/misc.xml
	.idea/modules.xml
	.idea/workspace.xml
	nerd-cal.iml
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	.gitignore
	.idea/misc.xml
	.idea/modules.xml
	.idea/workspace.xml
added .idea to gitignore