Hi everyone. If you haven't already, don't forget to join airpoints so
that you can claim airpoints dollars for our Air New Zealand and Star
Alliance flights. You can join for free by using the promo code JOINAP
during registration. You should earn $120 or so worth of airpoints
dollars. https://airnz.custhelp.com/app/answers/detail/a_id/2977
Merge branch 'master' of https://github.com/ElectricityAuthority/asx

Conflicts:
	index.html