merge
Merge branch 'master' of https://github.com/tdjackey/hackthu

Conflicts:
	db.json
Merge branch 'master' of https://github.com/tdjackey/hackthu
Merge branch 'master' of https://github.com/tdjackey/hackthu
Merge branch 'master' of https://github.com/tdjackey/hackthu
Merge branch 'master' of https://github.com/tdjackey/hackthu
Merge branch 'master' of https://github.com/tdjackey/hackthu
Merge branch 'master' of https://github.com/tdjackey/hackthu
Merge branch 'master' of https://github.com/tdjackey/hackthu
merge
Merge branch 'master' of https://github.com/tdjackey/hackthu

Conflicts:
	db.json