link change
Merge branch 'master' of https://github.com/easi6/blt-homepage

Conflicts:
	app/views/main.jade