fang report
Merge branch 'master' of https://github.com/jester9908/headFirst into currentWork

Conflicts:
	report.html
	style.css
Merge branch 'currentWork' of https://github.com/jester9908/headFirst into currentWork
Merge remote-tracking branch 'origin/working' into working