fixed application HTML

moved footer to body, put container wrapper in index.html
fixed merge conflict

Conflicts:
	finalproject/app/views/layouts/application.html.erb