Split the code into two branches: “master” (stable) and “development (unstable). New code additions should go in the development branch until they have been tested, then they can be merged into the master branch.

To switch branches using SourceTree:

In the left sidebar: under REMOTES / origin, double click on “development” (gray icon). You then will be able to add the development branch as a local branch that you can work on. This sets up the two branches so you can switch back and forth between them.

To switch between branches, double click on the appropriate branch under BRANCHES in the sidebar (blue icons)

Important: when pushing changes, be sure to make sure you are pushing to the branch you want
Revert "Added functionality for reverting a schedule to default"

This reverts commit caeba084d2212c85e7b1f3fa4c841e3304a45bc7.
Merge remote-tracking branch 'origin/development' for release 0.9.9

Resolved conflicts:
	app.yaml
	view/templating/dates.html
Merge remote-tracking branch 'origin/development'

Version 1.0.0 release
Fixed the navbar
Version 1.0.1
Merge remote-tracking branch 'origin/development'

Version 1.5

Main page automatically updates when blocks change
Page title (at top of browser window) shows when current block ends/next starts
BearStatus can be added to home screen on iOS and Android and run like an app
New icon
Interface improvements
Main page no longer shows “Now” and “Next” if they are empty
Before and after school “blocks” removed
Changed logo font to be consistent across all devices
Enhancements to schedule editing interface
Blocks 8 and 9 added to schedule
Change app engine version to 1-5
Merge branch 'release/1.5.1'
Merge branch 'release/1.5.2'
fix improperly named icon
Merge branch 'hotfix/1.5.2.1' into development
bump version, fixed some weird merge issues