branch test
Merge branch 'Taiwo'
Cleaned code and started skeleton