readme change
Merge branch 'master' of https://github.com/margaretblue/peekinonme

Conflicts:
	README.md
installed bootstrap, welcome controller, root index
merging development branch, installed bootstrap, welcome controller, root index