Merge branch 'master' into tims
Updatad activity display names, added something else but i'm tired and forgot. O yea no more null crash if user deosn't input salary
Merge branch 'tims'
Merge branch 'master' of https://github.com/westjour/CodeMichApp

Merged Conflicts:
	MyApplication/app/app.iml
	MyApplication/app/src/main/AndroidManifest.xml

MyApplication/app/src/main/java/com/example/jourdan/myapplication/AsyncT
askParseJson.java

MyApplication/app/src/main/java/com/example/jourdan/myapplication/JsonPa
rser.java

MyApplication/app/src/main/java/com/example/jourdan/myapplication/MapAct
ivity.java