Moved API framework out of web and created web folders
Merge branch 'master' of github.com:jacobwwalker/caerus-web

Conflicts:
	index.html