commited on 10012014 at 1226
Merge branch 'master' of https://github.com/rajacs2010/AMS_NOW