Refactored.
Merge branch 'master' of https://github.com/aminimalanimal/aminimalanimal

Conflicts:
	gulpfile.js