renaming .gitignore file
added new post page
Merge branch 'master' of https://github.com/mECEspring2014/app
asdf
removed global project.properties file. MAKE SURE YOU COPY YOUR PROJECT.PROPERTIES FILE AND COPY IT BACK INTO YOUR DIRECTORY AFTER YOU PULL. THIS PULL WILL DELETE IT FROM YOUR REPO
Merge branch 'master' of https://github.com/mECEspring2014/app
mece
Merge branch 'master' of https://github.com/mECEspring2014/app
Merge branch 'learninghowtogit'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/TestApp.apk
	bin/classes.dex
	bin/classes/com/example/testapp/MainActivity$DummySectionFragment.class
	bin/classes/com/example/testapp/MainActivity.class
	bin/classes/com/example/testapp/R$dimen.class
	bin/classes/com/example/testapp/R$drawable.class
	bin/classes/com/example/testapp/R$id.class
	bin/classes/com/example/testapp/R$layout.class
	bin/classes/com/example/testapp/R$menu.class
	bin/classes/com/example/testapp/R$string.class
	bin/classes/com/example/testapp/R$style.class
	bin/classes/com/example/testapp/R.class
	bin/dexedLibs/android-support-v4-e916d7b109e86c19f285cc72f1c47953.jar
	bin/resources.ap_
	gen/com/example/testapp/R.java
	project.properties
	res/values/colors.xml
	res/values/strings.xml
	src/com/example/testapp/BusActivity.java
	src/com/example/testapp/MainActivity.java
Some bus work.
removing bin/ and gen/
NOTE -- save your project properties elsewhere before pulling, this will remove it from your disk. You will need to rebuild after pulling.
git rm --cached /bin, /gen, project.properties
Merge branch 'busfun'

Conflicts:
	res/values/strings.xml
Fixed merge stuff. Learn to merge.
Delete activity_newpost.xml

removing antiquated file
Delete activity_newprof.xml

removing antiquated file
Delete NewPostActivity.java

removing antiquated file
Delete NewProfActivity.java

removing antiquated file
no message
Merge remote-tracking branch 'origin/master' into busfun