init commit
Initial commit
Merge branch 'master' of https://github.com/ConrMan/austere
Updated for Vicky
vicky'sfirst commit
vicky's stupid commit
updated reame
vicky edit1
made triangle thingys
vicky edit2
connor's branch
merged updates
vicky edit32
added font-awesome
idk i'm doing this to make it let me change branches
added team/about pages
changed nav for about/team pages
Merge branch 'master' into vicky
fixed everything
Delete .DS_Store