updated gitignore to add iml files, set up on windows
Merge branch 'master' of github.com:anuragdadheech/cyanogenmod-theme1

Conflicts:
	.gitignore