Attempting Git resolution outside of Gulp.
Merge branch 'develop' of https://github.com/evelynStraigt/Aria-Updater into develop