Merge pull request #11 from nuvention-web/master

3/10 - we just merged our dev branch into master, now comparing it to submission. See issues for list of new features.