With Basic SQL Query (raw brah)
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/michael/cal/CalSQL/CalSqlAdapter.java
With Basic SQL Query (raw brah)
With Basic SQL Query (raw brah)
Merge branch 'master' of https://github.com/mbartling/Cal