added ec2 connection and mysql db
forced commit
fixed merge