Merge branch 'master' of https://github.com/jkutk/bigdata-hive-webtraffic-demo

Conflicts:
	load-traffic.q
Fixed Conflict in load-traffic.q
Merge branch 'master' of https://github.com/jkutk/bigdata-hive-webtraffic-demo

Conflicts:
	load-traffic.q