first commit
yee
test
removed everything
first commit
updated auth
swag
deleted .txt file
added event-ctrl (work in progress)
Merge branch 'master' of https://github.com/ucsdcirclek/konnection-frontend
Merge branch 'master' of https://github.com/jhgamboa/konnection-frontend
Merge branch 'master' of https://github.com/jhgamboa/konnection-frontend
removed unwanted files
Merge remote-tracking branch 'upstream/master'
added event partial and controller
added calendar partial, edited event controller and partial, konnection.js file
Merge branch 'master' of https://github.com/jhgamboa/konnection-frontend into jhgamboa-master

Conflicts:
	app/index.html
	app/scripts/konnection.js
Merge branch 'jhgamboa-master'
Added README.md