Working with firebasebasics
Merge branch 'master' of github.com:lukegeiken4/Gifasent

Conflicts:
	gifasent/www/contacts.html
Merge branch 'master' of github.com:lukegeiken4/Gifasent

Conflicts:
	gifasent/platforms/android/CordovaLib/ant-build/build.prop
	gifasent/platforms/android/ant-build/Gifasent-debug-unaligned.apk
	gifasent/platforms/android/ant-build/Gifasent-debug.apk
	gifasent/platforms/android/ant-build/Gifasent.ap_
	gifasent/platforms/android/ant-build/Gifasent.ap_.d
	gifasent/platforms/android/ant-build/build.prop
	gifasent/platforms/android/assets/www/contacts.html
	gifasent/www/contacts.html