revert to alignment and reformatting changes
Merge branch 'kaley'

Conflicts:
	422Disassembler.X68
Still reformatting
Merge branch 'origin/abby' of https://github.com/cgoodling/422 into temp

Conflicts:
	422Disassembler.X68
Merge branch 'temp'