Removed a .DS_Store file that shouldn't have been added.
Fixed some template problems.