Stuff From Home
Merge remote-tracking branch 'origin/HomwWork' into HomwWork

Conflicts:
	app/js/bundle.js
	app/js/main.js
	app/js/modules/People.js
	index.js
	package.json