test commit of just a gitignore file
test
test2
test
Ok, ready to go....
Added Blank Project
Added Readme.md
Added in buttons, generally fiddling around
Buttons now scale to fill the screen, regardless of the screen size. It
ooks like autoscaling the text will be more difficult to do, and also
probably cause issues with the app, as the text gets scaled to a font
size depending on what the user has set. This means we I guess should
just hope that the caree has set up their phone so that text is big
enough for them to read for them, which I feel should be a safe enough
assumption...
Created Basic Interaction (working buttons)
Created Basic Flow between Home - Alarm Activities
Put stuff in manifest that prevents app from going landscape mode
Added Parse SDK. And inserted working code.
Completed working Push system for HELP/Check-IN/Cancel
Checkpoint. Demo 1
Added stuff to show that carer can open notifications
Got rid of some up/action bar stuff
Rearranged some Manifest things
In general, some cleanup
Checkout. Completed Demo. Going to forceback upstream
Resolving merge conflicts with my derpy code, nothing overwritten, this
commit is identical to the prior.

Merge branch 'master' of
https://bairrd@bitbucket.org/bairrd/swen30007-group-4.git

Conflicts:
	EmergencyButton/res/layout/activity_main.xml
	EmergencyButton/res/values/strings.xml
jenkins ant build file added
added JUnit unit test example
updated readme, added tag?