Merge branch 'master' of https://github.com/abyx/skeleton-group3

Conflicts:
	public/js/view2.js