MANUAL COMMIT 25/09/2014
Merge branch 'master' of github.com:sach38/CloudUp