Merge branch 'master' of https://github.com/tallguyjenks/fla.sh

flash

@@ -230,7 +230,9 @@ esac
 
 # The top part of the flash display so that code is not duplicated twice
 print_head(){
-    QUESTION=$(echo "${q[1]}" | fold -w 59)
+
+QUESTION=$(echo "${q[1]}" | fold -w 59)
+
     echo -e "${WHITEBG}          Fla.sh - Flash Cards In Your Terminal            ${NC}
 ${ORANGE}${BOLD}  Current Deck:${BOLD}${NC}\t$(basename -s .csv "$CURRENT_DECK")
 ${ORANGE}${BOLD}Cards Reviewed:${BOLD}${NC}\t$COUNTER
@@ -248,9 +250,14 @@ $(if [ ${#QUESTION} -lt 59 ]; then printf "%$(( ( 59 - ${#QUESTION} ) / 2 ))s";
 add_usage_entry(){
     if [ ! "$COUNTER" = 0 ]; then
         # Create a New Entry
+<<<<<<< HEAD
         TIME_STAMP=$(date +"%Y%m%d %H:%M:%S")
         REVIEWED_DECK="$(echo "$EXAMPLE_DECK" | awk -F/ '{print $7}')"
         printf -v ENTRY "TimeStamp: %s Deck: %s cardsReviewed: %s" "$TIME_STAMP" "$REVIEWED_DECK" "$COUNTER"
+=======
+        TIME_STAMP=$(date --rfc-3339=seconds)
+        printf -v ENTRY "TimeStamp: %s Deck: %s cardsReviewed: %s" "$TIME_STAMP" "$CURRENT_DECK" "$COUNTER"
+>>>>>>> 96762bab041d0351c1bc8e94e38757aa2f618013
         echo "$ENTRY" >> "$REVIEW_LOG"
     fi
 }
@@ -281,7 +288,9 @@ ${LGREY}──────────────── Press [Enter] to contin
     if [ "$NEXT" = q ] || [ "$NEXT" = Q ]; then
         add_usage_entry && cd "$PWD" && clear && exit 0
     fi
-    ANSWER=$(echo "${q[2]}" | fold -w 59)
+
+ANSWER=$(echo "${q[2]}" | fold -w 59)
+
     echo -e "___________________________________________________________
 
 $(if [ ${#ANSWER} -lt 59 ]; then printf "%$(( ( 59 - ${#ANSWER} ) / 2 ))s"; fi)$ANSWER