25
Merge branch 'master' of https://github.com/DavidSalzer/zipwize

Conflicts:
	js/navigation.js
25 ... after conflict