Merge remote-tracking branch 'aroth4/master'
edited and updated ProfileView.java
Merge remote-tracking branch 'tbibb/master'