Merge pull request #2 from bparees/master

fix app.rb repo reference
use local app.rb instead of remote url
test change
Revert "test change"

This reverts commit 4dc1ad65edee2d4dd57f37e2e835c58d78f8edcf.
test update
.
.
.
back to normal
Merge pull request #3 from bparees/master

do not use remote app rb file
switch to using common base image
Merge pull request #4 from bparees/master

switch to common base image
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Dockerfile