Adding .idea/ to .gitignore
Merge branch 'master' of github.com:ashokgowtham/weavesilk

Conflicts:
	.gitignore