I'm a soul man
blawerhgalsdfk
>:|
Hate hate hate
empty commit
empty commit
Why won't you work heroku
empty commit
f*k heroku
empty commit
Some changes to controllers and things
Merge branch 'KAPI-2'

Conflicts:
	app/controllers/KegController.java
Adding sql
updating keg controller to allow origin *
Merge branch 'master' of heroku.com:kegnected-api

Conflicts:
	app/controllers/SessionController.java
	app/models/KegSession.java
	conf/evolutions/default/1.sql
Adding options endpoint
Allow * from central place
Adding moar headers
Adding qr decoding stuff
Merge branch 'master' into KAPI-2

Conflicts:
	app/controllers/KegController.java