added newer stuff to new
Merge branch 'master' of https://github.com/akdor1154/fit3140