Reverted bad changes and added new data type
Merge branch 'master' of https://github.com/mtp26/INFSCI2560SpringAMP