removed aws.json
Merge branch 'master' of https://github.com/GoldenLions/Artproject
Merge pull request #3 from browles/master

aws
(fix) changed route to html files
Merge pull request #14 from kwalker3690/master

(fix) changed route to html files
(fix) modified client links to lib files
Merge pull request #15 from kwalker3690/front-end

(fix) modified client links to lib files
lots of front end file cleanup
removing deleted files
Merge pull request #16 from kwalker3690/front-end

(cleanup) Code cleanup in client
fixing merge conflict
Update .gitignore
Delete .DS_Store
Merge branch 'master' of https://github.com/GoldenLions/Artproject into artsafari

Conflicts:
	.DS_Store
	client/.DS_Store
	client/www/.DS_Store
	client/www/index.html
	client/www/scripts/app.js