initial commit of alans work
updated config for proper framework
Merge pull request #1 from RichmondDay/master

Syncing master to development