Changed universal.h and it's includes

Changed universal.h and it's includes
Resolved conflicts
Merge branch 'master' of https://github.com/nicholascgilpin/AggieSnap_28