okeanos first commit
test
correct gitignore on okeanos
Merge branch 'master' of https://github.com/guardian21/warfacts-strategist
Merge branch 'master' of https://github.com/guardian21/warfacts-strategist

Conflicts:
	app/storage/access.log
s
Must be fixed