Merge pull request #1 from callen5914/master

pull
Merge branch 'master' into gh-pages
Conditionals_Wacky

Here is my intial working version of Red Solo Cup Pyramid Calculator.
More features to come...
Conditonals_Wacky
Functions_Wacky

Initial File Structure Commit
Functions_Industry

Initial File Structure Commit
Functions_Personal

Initial File Structure Commit
Functions Personal

Just Barely got this working
Functions Industry
Merge pull request #2 from callen5914/gh-pages

Pull