xcode stuff

rutine
Merge branch 'master' of https://github.com/roman0316/4oneIOSxcode

Conflicts:
	www/css/styles.css