Merging resources from ZIP file.

Pulling changes made by Chris into the repository.
Merging resources from zip file.

Merging Chris's changes.
Merge branch 'master' of https://github.com/beriukay/DogeDefense

Conflicts:
	Assets/Enemies/Erik.prefab
	Assets/TD.unity
	Assets/Towers/Cannon.prefab

Attempting to merge the objects from a previous commit to add in Chris's
latest work.
Modified .gitignore file.

Remove boo project files from the commits.