version 1, assignment 7.1

move if/else statements on assignment 3.1 to one line.
assignment 6.1 and 7.1 are still pending
while this is nice for html sometimes, for the most part just keeping your indention straight and keeping tabs and spaces consistent is an easy way to tell which closing bracket it is