addtext gayfer
Merge branch 'master' of https://github.com/csherland/HackCooper-NoContextWallpaper

Conflicts:
	nocontext/addText.py

'fix addtext'
Merge branch 'master' of https://github.com/csherland/HackCooper-NoContextWallpaper

'fix addtext'
Merge branch 'master' of https://github.com/csherland/HackCooper-NoContextWallpaper

'fixies'
Merge branch 'master' of https://github.com/csherland/HackCooper-NoContextWallpaper

'gayfer'
add author to overlay
Merge branch 'master' of https://github.com/csherland/HackCooper-NoContextWallpaper
update addtext, remove font