Adding in new file structure.
idk
Merge branch 'master' of https://github.com/TGrant15/BULK.git
No changes
no changes.
no changes.
no changes.
Merged.
no change.
Changes.
Merge branch 'master' of https://github.com/TGrant15/BULK.git

Conflicts:
	iBulk/bin/iBulk.apk
	iBulk/bin/resources.ap_
Merge branch 'master' of https://github.com/TGrant15/BULK.git

Conflicts:
	iBulk/.settings/org.eclipse.jdt.core.prefs
	iBulk/assets/www/Views/Home/login.html
	iBulk/assets/www/Views/Home/register.html
	iBulk/assets/www/css/main.css
	iBulk/assets/www/index.html
	iBulk/assets/www/index.js
	iBulk/assets/www/js/animations.js
	iBulk/assets/www/js/common.js
	iBulk/assets/www/js/login.js
Merge branch 'master' of https://github.com/TGrant15/BULK

Conflicts:
	iBulk/assets/www/index.html
	iBulk/bin/iBulk.apk
testing