Features completed:
Added IDataMiner.java, DataMiner.java, and DataPoint.java.
Add geofencing algorithm. (Added, but not implemented)
Set the turn on/off feature (Added, not completely implemented due to the alarm system part still needing to be added)
Begin updating the the map every 15 minutes with specific longitude and latitude points. (right now its set to every 10 seconds for 3 minutes to add random points)
Setup enumerator for alarm type (added)
Set full screen like the login page has (set up full screen but not like the auto hide or unhide like the login page)
add a feature to vibrate phone (added)
Check the alarm password with distress signal or password (actions are based on which password is entered). (Added)
Added events when the back button is pressed
Work on sending emails when user forgets their password. (added but attempting to still send email without opening gmail)

Errors Fixed:
When user clicks the volume button during alarm sound, user can still turn down the volume

Current Errors:
Work on sending emails when user forgets their password. (added but attempting to still send email without opening gmail)
Finish the turn on/off feature

To complete:
After user enters new contacts, save the contacts to a text file.
When registering new accounts, update the text file.
Save the users points to a text file.
Work on getting the camera to take pictures or record video.
Features completed:
Added IDataMiner.java, DataMiner.java, and DataPoint.java.
Add geofencing algorithm. (Added, but not implemented)
Set the turn on/off feature (Added, not completely implemented due to the alarm system part still needing to be added)
Begin updating the the map every 15 minutes with specific longitude and latitude points. (right now its set to every 10 seconds for 3 minutes to add random points)
Setup enumerator for alarm type (added)
Set full screen like the login page has (set up full screen but not like the auto hide or unhide like the login page)
add a feature to vibrate phone (added)
Check the alarm password with distress signal or password (actions are based on which password is entered). (Added)
Added events when the back button is pressed
Work on sending emails when user forgets their password. (added but attempting to still send email without opening gmail)

Errors Fixed:
When user clicks the volume button during alarm sound, user can still turn down the volume

Current Errors:
Work on sending emails when user forgets their password. (added but attempting to still send email without opening gmail)
Finish the turn on/off feature

To complete:
After user enters new contacts, save the contacts to a text file.
When registering new accounts, update the text file.
Save the users points to a text file.
Work on getting the camera to take pictures or record video.
commiting changes etc.
Merge branch 'master' of https://github.com/blackburnk/insecurity

Conflicts:
	app/bin/classes/com/osu/insecurity/Login.class
	app/bin/classes/com/osu/insecurity/R$id.class
	app/bin/classes/com/osu/insecurity/R$layout.class
	app/bin/classes/com/osu/insecurity/R$string.class
	app/bin/classes/com/osu/insecurity/R$style.class
	app/bin/classes/com/osu/insecurity/R$styleable.class
	app/gen/com/osu/insecurity/R.java
	app/src/com/osu/insecurity/DatabaseHelper.java