Added frequency calculation functionality.
Merge branch 'master' of https://github.com/amadeus428/trunk.git

Conflicts:
	Amadeus/bin/classes/com/cs429/amadeus/MainActivity.class
	Amadeus/bin/classes/com/cs429/amadeus/R$id.class
	Amadeus/bin/classes/com/cs429/amadeus/R$layout.class
	Amadeus/bin/classes/com/cs429/amadeus/R$menu.class
	Amadeus/bin/classes/com/cs429/amadeus/R$string.class
	Amadeus/bin/classes/com/cs429/amadeus/R$style.class
	Amadeus/gen/com/cs429/amadeus/R.java
	Amadeus/res/layout/activity_main.xml
	Amadeus/src/com/cs429/amadeus/MainActivity.java