Init
Merge branch 'master' of https://github.com/Bitworker/weekly

Conflicts:
	.gitignore