Second initial commit

Work done Fall 2014 semester