Removes template HTML and adds wrapper
Merge pull request #1 from tbarth17/master

good to go
Merge branch 'jgoley-honathan'
Merge branch 'master' of github.com:millesky87/testrepo

Conflicts:
	app/index.html
Merge branch 'master' of github.com:millesky87/testrepo into tommy
Attack functions