Merged database and interface
MERGING DATABASE AND GUI
commiting shiz
death to git
Fixed merge conflicts 6/9/14