Merge pull request #1 from hahmed13/storyBoard

test
hello
Merge remote-tracking branch 'workingcopy/master' into dataStructure
Class defined
Merge pull request #2 from jhaybie/Storyboard

Class defined
working
Merge pull request #3 from deebost/dataStructure

Data structure
Merge pull request #4 from jhaybie/master

UI Elements
Merge remote-tracking branch 'WorkingCopy/master' into storyBoard
switch to temp array
created more code
Merge pull request #5 from deebost/dataStructure

switch to temp array
Merge remote-tracking branch 'origin/master' into Storyboard
Merge pull request #6 from jhaybie/Storyboard

Merge pull request #4 from jhaybie/master
created more code
Cleaned up more code
Cleaned up more code
Cleaned up some more code
Merge pull request #7 from jhaybie/JSON

Json
Merge remote-tracking branch 'WorkingCopy/master' into storyBoard