Chef solo container on ubuntu 12.04
Update README.md
Update README.md
Update README.md
Update Dockerfile
Update Dockerfile
Update Dockerfile
Update Dockerfile
Merge remote-tracking branch 'origin/12-04'

Conflicts:
	Dockerfile