Change
Merge branch 'master' of https://github.com/KeatonTech/Chromosapiens-Note-App

Conflicts:
	controllers/api.py
Fixed stuff and added API