no message
Merge branch 'master' of https://github.com/tsaastam/yhack-2013

Conflicts:
	expedia.js
Merge branch 'master' of https://github.com/tsaastam/yhack-2013

Conflicts:
	index.html
	sun_holiday_planner.js
no message