Updating code
Merge branch 'master' of github.com:alinal/megavista

Conflicts:
	users/.DS_Store
	users/alina/.DS_Store