COMMIT FROM AEROCOOL 21/10/2014
Merge branch 'master' of github.com:sach38/CloudUp