went back to defult and tried to add push notification all over again
Merge branch 'master' of https://github.com/zackmon/GPA-Calculator

Conflicts:
	www/config.xml
	www/index.html