adding some js
Merge branch 'master' of https://github.com/toddzebert/ceamodev

Conflicts:
	index.html
	js/wecation.js