Apparently having the instructions in a textview screwed everything up
Merge branch 'master' of github.com:vmagro/GlassTimelapse

Conflicts:
	.gitignore