updated reame
made triangle thingys
connor's branch
merged updates
added font-awesome
idk i'm doing this to make it let me change branches