nothing really
Merge branch 'master' of https://github.com/hackercards/hackercards

Conflicts:
	static/main.css
changed header font
Merge branch 'master' of https://github.com/hackercards/hackercards