project file
Merge branch 'master' of https://github.com/bkane11/tri

Conflicts:
	.project
Tweaks to element positions at different browser resolutions.