initial commit
Merge https://github.com/CoffeeJack/EECE496