added link to startv3
Merge branch 'master' of https://github.com/nad69/tamc-prototype

Conflicts:
	public/sass/application.scss
	public/stylesheets/application.css
Merge branch 'master' of https://github.com/nad69/tamc-prototype
no message
Merge branch 'master' of https://github.com/nad69/tamc-prototype