Modified .gitIgnore and merged conflict, preparing to work off of develop