Set up combat state relationships
Lots of database migrations
Added restful action code for combats_controller
Redirected flash messages correctly in combats_controller
Moved navbar and header to template file