Merging remote, cleaning up documentation and adding further documentation to fighter view files.
Actually merging now if git wants to let me.
Attmepting another merge.
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam