Testing camera api
Merge branch 'master' of https://github.com/litopia/unicat

Conflicts:
	css/layout.css
Making the upload file button work for iOS camera access
playing with camera api
Merge branch 'master' of https://github.com/litopia/unicat

Conflicts:
	css/layout.css
Adding input file type button to work in iOS devices
Merge branch 'master' of https://github.com/litopia/unicat

Conflicts:
	css/layout.css
	index.html
Merge branch 'camera'

Conflicts:
	css/camera.css
	index.html
	js/main.js
Converting css to sass files with file structure. Merge branch 'master' of https://github.com/litopia/unicat

Conflicts:
	css/layout.css
	index.html
Merge branch 'master' of https://github.com/litopia/unicat