Initial commit!
Initial commit!
lkjlj

lkjlkj
Merge branch 'master' of https://github.com/pussmun-12/mylife

Conflicts:
	assets/www/index.html
	assets/www/js/cordova.js
	assets/www/js/index.js