Development

Updated gitignore. Was trying to get rid of the extra merge commit. Gave up in the end. :P