Karan copmmit
Merge remote-tracking branch 'origin/master'

Conflicts:
	HabitTrack/src/main/java/com/ivywire/habittrack/ProgressBar1.java
Merge remote-tracking branch 'origin/master'
Karan copmmit