merging for the first time
Working on some basic database stuff
Justin sux
Justin sux