kshah2451/EECE381Module2 — pull request #16 by g10-dl (2014-03-19 02:51:37+00:00)
Title: David

Fixed merge conflicts, added sliders without functionality yet.