…-app

Conflicts:
	trainer/src/components/app/app.ts

…d child.

http://stackoverflow.com/questions/34540615/how-do-i-inject-a-parent-component-into-a-child-component
Made variables private

…using events and template variables

Conflicts:
	trainer/src/components/app/app.ts
	trainer/src/components/app/workout-history.tpl.html
	trainer/src/components/app/workout-history.ts
	trainer/src/tsconfig.json

# Conflicts:
#	trainer/README.md

# Conflicts:
#	trainer/README.md

# Conflicts:
#	trainer/README.md

…r2byexample into checkpoint4.1

# Conflicts:
#	trainer/src/components/app/app.routes.ts

…odule

…odule

…r2byexample into checkpoint4.2

…-typescript

# Conflicts:
#	trainer/package.json
#	trainer/typings.json

# Conflicts:
#	trainer/package.json

# Conflicts:
#	trainer/README.md