adding stuff
Merge branch 'master' of https://github.com/hmillison/livecode

Conflicts:
	views/index.ejs