Dimfishy/Franis4 — pull request #1 by HunterX263 (2014-06-17 18:22:04+00:00)
Title: Metafiles

Updated Gitignore to ignore some editor-specific unity files that don't need to be shared, and changed the asset serialisation to Force Text to hopefully improve merging.