Changes for week 2.

Changed main Processess.js,manifest,tiapp.xml to reflect new icon and
new application name.
Merge branch 'master' into BordersCS633

Conflicts:
	Resources/views/Processes.js
Downloading changes from 3/26/14

Download changes from MacPro Book to iMAC
Merge branch 'master' of https://github.com/gcborders/PMP-Fundamentals-resource-tree into BordersCS633

Conflicts:
	Resources/views/DetailView.js
	Resources/views/MainWindowView.js
Update my branch with changes

Update the branch
Merge branch 'master' of https://github.com/gcborders/PMP-Fundamentals-resource-tree into BordersCS633
Downloaded changes 3/31/14

Downloaded all changes from 3/31/14
Changes

Updates
Commit of 4/1/2014

- Added button bar
- Adjusted graphics for iOS
- Added backgrounds
Changed button dpi
Button changes

Changed the dpi for the button
Commit and clean 4/6/14
Merge branch 'master' of https://github.com/gcborders/PMP-Fundamentals-resource-tree into BordersCS633

Conflicts:
	Resources/views/MainWindowView.js
	Resources/views/Processes.js
Committing Processes.js image changes
Merged Master into my branch

Merge from Master 4/11/14
Commit for changes 4/10/14

Commit manifest
Accept changes 4/10/14

Attempting to catch up to Master
Gregg's Content

Added Gregg's content, plus some formatting changes and a button to
reveal sample question answers.
Merge pull request #19 from gcborders/Crystal

Gregg's Content
Merge pull request #20 from gcborders/Sama

Sama