First commit
Merge branch 'master' of https://github.com/maxlogic-github/test_at_2014-12-14_v1

Conflicts:
	.gitignore