Merge pull request #66 from COSI236TA/integrate

Integrate
Added loading icons...