Amanda's changes
Merge branch 'master' of https://github.com/Shantaviae/Pintu

Conflicts:
	gen/android/support/v7/appcompat/R.java
	gen/com/tangibledesign/pintu/R.java
	res/values/strings.xml