Pull request #2

Open

owengong wants to merge 83 commits intoowengong:masterfrom

MWHSCS-ORG:master

Commits on Jan 14, 2016

Changed runner to main. Mostly testing reasons.
dbradley771
committed
Delete test.txt
MWHSCS
committed
Merge branch 'master' of https://github.com/MWHSComputerScience-ORG/StoreSim-APCS2016.git

dbradley771
authored and
dbradley771
committed
Fixed title caps
dbradley771
committed

Commits on Jan 15, 2016

Commits on Jan 19, 2016

Removed return values and changed to void for SET methods
ckauth97
committed
created my name file, and added my name
Temperdox
committed
Created file with my name
agilroy061
committed
Created name text file
akusleika
committed
did dun this sturff
shinyPIKACHUx
committed
gg bro
Gray584
committed
This is my name and I made it for commiting
silvercorked
committed
Update muehlich.txt
zmuehlich615
committed
Merge pull request #2 from zmuehlich615/master
MWHSCS
committed
Merge pull request #1 from MWHSComputerScience-ORG/master
zmuehlich615
committed
Create readme.txt
Collin Kauth-Fisher
committed
Merge pull request #3 from Temperdox/master
MWHSCS
committed
Merge pull request #4 from silvercorked/master
MWHSCS
committed
Merge pull request #5 from jhoogner/master
MWHSCS
committed
Merge pull request #6 from sosborn002/master
MWHSCS
committed
Merge pull request #12 from shinyPIKACHUx/master
MWHSCS
committed
Merge pull request #7 from njones958/master
MWHSCS
committed
Merge pull request #8 from sflott393/master
MWHSCS
committed
Merge pull request #9 from agilroy061/master
MWHSCS
committed
Merge pull request #10 from dbeut/master
MWHSCS
committed
Merge pull request #11 from ogong500/master
MWHSCS
committed
Rename AlecGilroy to NameFiles/AlecGilroy
Collin Kauth-Fisher
committed
Rename Alex Wissing.txt to NameFiles/Alex Wissing.txt
Collin Kauth-Fisher
committed
Rename Corbin_Babcock.txt to NameFiles/Corbin_Babcock.txt
Collin Kauth-Fisher
committed
Rename NickJones.txt to NameFiles/NickJones.txt
Collin Kauth-Fisher
committed
Rename ShaneFlott.txt to NameFiles/ShaneFlott.txt
Collin Kauth-Fisher
committed
Rename StephenOsborn.txt to NameFiles/StephenOsborn.txt
Collin Kauth-Fisher
committed
Rename Untitled 1 to NameFiles/Josh Hoogner
Collin Kauth-Fisher
committed
Rename muehlich.txt to NameFiles/muehlich.txt
Collin Kauth-Fisher
committed
Rename schuyler to NameFiles/schuyler
Collin Kauth-Fisher
committed
Moved Name Files Over To Folder
ckauth97
committed
Still Moving Text Files
ckauth97
committed
Removed Unessesary
ckauth97
committed
Moving Name Files
ckauth97
committed

Commits on Jan 20, 2016

Commits on Jan 22, 2016

This is my food and it's rather dank in my opinion but ya know I think
silvercorked
committed

Commits on Jan 26, 2016

Removed
ckauth97
committed
Minor Update of Formatting
ckauth97
committed
Update .classpath
dbradley771
committed
We gooffed.
dbradley771
committed
Removed Skylar's uploads...
ckauth97
committed
Removed Main and Changed to Runner
ckauth97
committed
More interface and restructured food.
dbradley771
committed
Merge branch 'master' of
dbradley771
committed
Renamed runner and removed extra spacing.
dbradley771
committed
Restructuring of Packages
ckauth97
committed

Commits on Jan 27, 2016

I believe I have fixed these food classes.
silvercorked
committed

Commits on Jan 28, 2016

Ok now I matched my code to the one you put on the board and I'm sure
silvercorked
committed

Commits on Jan 29, 2016

3 Foods - Apples, Bananas, Popcorn
zmuehlich615
committed
Adding Two Foods to the game -- Nick Jones
njones958
committed
Added Pie Class and Pie Mix Class
csnodgrass
committed
Added both food classes
sosborn002
committed
Ok now im sure its good. I was sure last time but now im more sure.
SilverCorked
committed
Andrew Kusleika food classes
akusleika
committed
Added Pie Class and Pie Mix with changes
csnodgrass
committed
Added Food Classes
Gray584
committed
food classes uploaded
jhoogner379
committed
Added Food Classes
dbeut
committed
Merge pull request #14 from silvercorked/master
dbradley771
committed
Merge pull request #16 from csnodgrass/master
dbradley771
committed
Merge pull request #26 from ogong500/master
Collin Kauth-Fisher
committed
Merge pull request #17 from zmuehlich615/master
dbradley771
committed
Merge pull request #18 from njones958/master
dbradley771
committed
Merge pull request #25 from dbeut/master
Collin Kauth-Fisher
committed
Merge pull request #24 from jhoogner/master
Collin Kauth-Fisher
committed
Merge pull request #23 from akusleika/master
Collin Kauth-Fisher
committed
Merge pull request #21 from sosborn002/master
dbradley771
committed
Merge pull request #22 from Gray584/master
dbradley771
committed
CLEAN
dbradley771
committed