Merge remote-tracking branch 'upstream/master' into fresh
site final for upload
Merge pull request #14 from sunnyLA4/fresh

final
Merge remote-tracking branch 'upstream/master' into fresh
Merge pull request #15 from sunnyLA4/fresh

conlicts cleared
final commit
Merge pull request #16 from sunnyLA4/fresh

final commit
Merge pull request #230 from sunnyLA4/master

final stage site. go for upload