Pic edit
Merge branch 'master' of https://github.com/spthm/bc-ethz
Merge branch 'master' of https://github.com/spthm/bc-ethz

Conflicts:
	Hearthstone_Screenshot_2.5.2014.17.42.26.png
≈Merge branch 'master' of https://github.com/spthm/bc-ethz
Merge branch 'master' of https://github.com/spthm/bc-ethz