Removed the body stuff that was was duplicated in the layout.erb. Everything still works
Merge branch 'master' of https://github.com/ChasevanHekken/clone_wars into fix_erbs_to_use_layout

Conflicts:
	lib/views/caphill.erb
	lib/views/locations.erb
Merge pull request #12 from ChasevanHekken/fix_erbs_to_use_layout

Fix erbs to use layout