Added ignores
Merge branch 'master' of https://github.com/NoviumDesign/Winwithin-2

Conflicts:
	resources/css/android.css