Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into jp822
Merge pull request #908 from stowellm/goat

Field Matching done locally, needs to be implemented in queue still
Merge pull request #909 from stowellm/goat

Pushed new Uploader to production
Merge remote-tracking branch 'upstream/master' into jp822
Hacked the API so that login works now muahahahahahaha. *Cough*
Merge pull request #910 from jaypoulz/jp822

Major hackzor.
New KitKat style Waffles
Merge remote-tracking branch 'upstream/master' into goat
Slight change to waffle check color