change order ot <td> tags
refactoring, moving forms and chunks of code around
Merge branch 'master' of https://github.com/chewett/COMP6205