;lk;lk
Merge branch 'master' of https://github.com/jonathanbugs/altitec

Conflicts:
	img/.DS_Store