Sync forc
Merge remote-tracking branch 'upstream/master'
Added in workstation shortcut, discomfort views
Added a bodyparts class
Addeed constructor
Added Ryan's xml into mine.
Merge branch 'develop'

Conflicts:
	StraightComfort/src/main/java/com/jrs/StraightComfort/Utilities/Bodypart.java
Transition to display screen
Merge pull request #18 from jsh0211/master

Finished transitions for 2/3 views