1. commit master Julian
Merge branch 'master' of https://github.com/Blackimp/FinalProject

Conflicts:
	js/functions.js