settings whatnot

settings and such
Merge branch 'master' of https://github.com/svkhadke/OneTouchCoffee

Conflicts:
	.idea/misc.xml