Initial commit from Aptana
Merge branch 'master' of https://github.com/julieancm/sample_app