sundarsiva/coding-excercise — pull request #4 by sundarsiva (2014-02-24 02:28:24+00:00)
Title: Merge branch 'develop' of https://github.com/sundarsiva/coding-excercise...

... into feature_wordfrequency_improve-word-identification

Conflicts:
wordfrequency/.idea/workspace.xml
wordfrequency/src/com/sundarsiva/wordfrequency/WordFrequency.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch feature_wordfrequency_improve-word-identification
# All conflicts fixed but you are still merging.
# (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified: wordfrequency/.idea/misc.xml
#	new file: wordfrequency/javadoc/allclasses-frame.html
#	new file: wordfrequency/javadoc/allclasses-noframe.html
#	new file: wordfrequency/javadoc/com/sundarsiva/wordfrequency/SortByValue.html
#	new file: wordfrequency/javadoc/com/sundarsiva/wordfrequency/SortByValueTest.html
#	new file: wordfrequency/javadoc/com/sundarsiva/wordfrequency/WordFrequency.html
#	new file: wordfrequency/javadoc/com/sundarsiva/wordfrequency/WordFrequencyTest.html
#	new file: wordfrequency/javadoc/com/sundarsiva/wordfrequency/package-frame.html
#	new file: wordfrequency/javadoc/com/sundarsiva/wordfrequency/package-summary.html
#	new file: wordfrequency/javadoc/com/sundarsiva/wordfrequency/package-tree.html
#	new file: wordfrequency/javadoc/constant-values.html
#	new file: wordfrequency/javadoc/deprecated-list.html
#	new file: wordfrequency/javadoc/help-doc.html
#	new file: wordfrequency/javadoc/index-files/index-1.html
#	new file: wordfrequency/javadoc/index-files/index-2.html
#	new file: wordfrequency/javadoc/index-files/index-3.html
#	new file: wordfrequency/javadoc/index-files/index-4.html
#	new file: wordfrequency/javadoc/index-files/index-5.html
#	new file: wordfrequency/javadoc/index-files/index-6.html
#	new file: wordfrequency/javadoc/index-files/index-7.html
#	new file: wordfrequency/javadoc/index.html
#	new file: wordfrequency/javadoc/overview-tree.html
#	new file: wordfrequency/javadoc/package-list
#	new file: wordfrequency/javadoc/resources/inherit.gif
#	new file: wordfrequency/javadoc/stylesheet.css
#	modified: wordfrequency/src/com/sundarsiva/wordfrequency/SortByValue.java
#	modified: wordfrequency/src/com/sundarsiva/wordfrequency/WordFrequency.java
#