Added some tests
Merge branch 'master' of https://github.com/CSc436/gymjournals
information page
now the user info is kept and i made a factory for possible future use
Merge branch 'master' into hzDisplayProfile
Merge remote-tracking branch 'origin/hzDisplayProfile' into inforpage
can view your workouts or see that you havent done any workouts
starting to add workout post look
look of post updated (which may need to be changed sometime in the future), and timeago for date when completed
removed lots of blank html
Merge remote-tracking branch 'origin/hzDisplayProfile' into inforpage
nothing changed..
Merge branch 'master' into hzDisplayProfile
Merge branch 'master' into inforpage
We have a new home page.
Merge branch 'master' into inforpage
agian..
setting page configure
Information page first built, controller works well
settings
merge master into my branch
Merge branch 'master' into inforpage

Conflicts:
	site/app/partials/_nav.html