Removed moving top bar and put in fix top bar
idk
Jobs page pulling from parse successfully
.
Merge branch 'samson' of https://github.com/OPUSNYC/opus_dopusNYC into junwoo

Conflicts:
	local_config.json
tried to query user information for profile edit
Merge branch 'master' of https://github.com/OPUSNYC/opus_dopusNYC

Conflicts:
	.template/android/assets/forge/all.js
	.template/android/assets/module_mapping.json
	.template/android/bin/classes.dex
	.template/config.json
	local_config.json
	src/config.json
	src/studentprofile.html
Merge branch 'master' of https://github.com/OPUSNYC/opus_dopusNYC

Conflicts:
	.template/android/assets/forge/all.js
	.template/android/assets/module_mapping.json
	.template/android/bin/classes.dex
	.template/config.json
	local_config.json
	src/config.json
	src/studentprofile.html
Merge branch 'master' of https://github.com/OPUSNYC/opus_dopusNYC

Conflicts:
	.template/android/assets/forge/all.js
	.template/android/assets/module_mapping.json
	.template/android/bin/classes.dex
	.template/config.json
	local_config.json
	src/config.json
Merge branch 'junwoo'

Conflicts:
	local_config.json
	src/details.html
	src/editprofile.html
	src/js/parseCode.js
	src/studentprofile.html
ignored local_config.json
Merge branch 'master' of https://github.com/OPUSNYC/opus_dopusNYC

Conflicts:
	src/editprofile.html
trigger stuff
idk
Merge branch 'samson' of https://github.com/OPUSNYC/opus_dopusNYC into junwoo

Conflicts:
	src/details.html
	src/editprofile.html
added apply button to jobs
Merge pull request #6 from OPUSNYC/junwoo

Junwoo
Merge branch 'samson'

Conflicts:
	local_config.json
	src/details.html
	src/js/parseCode.js
merge?
PHOTO UPLOAD WORKING