Merge pull request #20 from Currfyg/master

Merge
Updating to correct pages, bitch.
Merge branch 'master' of https://github.com/poloure/drunken-archer
moved something
Merge branch 'master' of https://github.com/poloure/drunken-archer

Conflicts:
	AndroidManifest.xml