changes
Merge branch 'master' of https://github.com/shfaizanali/ipad-learning-application

Conflicts:
	scripts/scripts.js