Signed-off-by: Aaron Lathrop <ausnacht@gmail.com>
Update Files

Signed-off-by: Aaron Lathrop <ausnacht@gmail.com>
Updating gitignore

Signed-off-by: Aaron Lathrop <ausnacht@gmail.com>
Merge branch 'master' of
https://github.com/AusNacht/Mobile_Homework3.git

Conflicts:
	res/layout/activity_main.xml
	res/layout/activity_my_web_fragment.xml
	res/layout/activity_url_list_fragment.xml
	src/edu/fsu/cs/alathrop/homework3/MyWebFragment.java
	src/edu/fsu/cs/alathrop/homework3/UrlListFragment.java

Signed-off-by: Aaron Lathrop <ausnacht@gmail.com>