First commit
Merge branch 'master' of github.com:kristjanAnd/andDev

Conflicts:
	README.md