trying out a new git client to see if we can ease up the learning curve
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from cartycrabber/master

testing testing 123
Test Change

Testing for ian
Merge remote-tracking branch 'origin/master'
what happens when pushing and pulling
Merge pull request #3 from cartycrabber/master

Scouting Page CSS, Input
Merge remote-tracking branch 'origin/master'
Merge pull request #3 from watermelonduck/master

explaining branches to will