removed camera
changed
dash
removed .idea folder
merged
Merge branch 'master' of https://github.com/dyoungikem/gidifarm

Conflicts:
	.idea/workspace.xml
	index.html
	js/app.js

merging all