ugh
Merge branch 'master' of github.com:tomkennedy22/DB-GUI-Fall2014
finished recipes, filters, recipeConnections for Nariana and Michael