stashing my gmail changes
Merge branch 'master' of https://www.github.com/thewayofknowing/PaisaSwipe

Conflicts:
	App/src/com/example/backup/SplashScreen.java
Merging again