changed gitignore
fixed gitignore
either I merged things, or I fucked up the database
Merge branch 'master' of ssh://github.com/BuckShlegeris/SubmissionApp
changes
merging
i have merged fine
everything is fine, get lost git
gah