Setup for June 2 Assignment
Completed assginment 1
Added .tmp to gitignore
Merge branch 'bergsel-dev' into gh-pages

* bergsel-dev:
  Completed assginment 1
  Setup for June 2 Assignment

Merge dev to prod